Removed duplicate and unused packages and classes.