Removed all setting stuff for time being and put into sepaate branch