cleaned up functions that were'nt needed