cleaned up from unused packages and some minor changes