remove unneeded else statements and files
fix hash making
.