Cleaned up config + dependencies