Cleaned project and updated some packages