Fixed all PR comments and will remove database.yml in following commit