Cleaned up lingering code and debugging