Removed some bits and pieces...