Cleanup unused code, will be moved soon