Cleaned up models & admin