Cleaned up after file merge