Removing redundant stuff + making proper use of sample library