Update 3.1.0

Removed functions not working as intended