Removed testing parts of functions