Removed misc external dependencies; Cleaned up for strict code compilation