Removed unused funtions