Performance fixes and cleanup