Removed GatewayUser.java and modified the other classes to not use it