Removed some Makefiles
Updated requirements
Fixed ambiguous function name