Removed unneeded file and added changes which try to solve 50