Cleaned up a bit from unused imports