Removed unnecessaryimports and fixed some bugs
Removed unnecessaryimports and fixed some bugs

OakdaleInnovation/oi-request-system,OakdaleInnovation/oi-beacon-request,OakdaleInnovation/oi-beacon-request,OakdaleInnovation/oi-request-system