1. Remove sql schema
2. Attempt at breaking cyclic dependencies