Removed irrelevant functions, and compiled again