Remove unused functions
Clean up by splitting up in let