Removed unused functions, added useful updated versions of functions from the FX