Removed Context(ctx), inbuilt route handler and done some cleanup