Removed currently unnecessary parts