Removed unused packages and general code clean-up.